more critical bugfixes