Fixes to the nuke stuff