non-critical bugfixes