Tiny changes and bugfixes