Gravity gen fixes