small bugfixes

small bugfixes