Bugfixes: various