Velocity bug fixes