Bugfixes

Please close this pull request