Fixes for v1.4.5

Moar small fixes.


92a7636 will make launcher startup whopping 500 ms faster