Smaller bugfixes