More critical bugfixes