Bugfixes

Phew