Nuke disarm fixes