More IMPORTANT Bugfixes