More gravity offset fixes