Small bugfixes after merge