Nuke shuttle tweaks