Bugfixes

The bugs I've noticed when deploying :).