Pre-ship Tweaks

... will be happening here.