Prelaunch fixes

Leaving open for now

<!---
@huboard:{"order":20.5,"custom_state":""}
-->