Small bugfixes.