even smaller bugfixes