Small bugfixes
Small bugfixes