Bugfixes after first test