Bugfixes

YEAH!