Some Hotfixes

Still buggy though