Re-shuttle tweaks