Just the Bugfixes

A commit without the tests for the bugfixes.