Bugfix

Small bugfixes