Bugfixes

small fixes