Small bugfixes..