some more very minor bugfixes