Just some Bugfixes

Fixes #1
Fixes #2
This tag has no release notes.