Some fixes to rockets