Small bugfixing