smaller bugfixes