More bugfixes

fixes!