Small fixes
Bugfixes