Tidying up for pre-launch push.