Startup fixes



<!---
@huboard:{"order":43.20703125,"custom_state":""}
-->