Critical Bugfixes

Man that was bad