Merge "Fix some things with overflow, persistence, & visibility" into rvc-dev