Small bugfixes
1.6.1