Velocity sync fixes