General fixes for rocket.