Bugfixes

In this pull re