Bugfixes after first run