Bugfixes after first beta test