critical bugfixes