Bugfixes

trying to unbreak master