Minor fixes for pre-launch