Minor bugfixes

Please review & pull