Bugfixes

Bugfix day.