Bugfixes for production