Bugfixes: some small ones