Bugfixes

This pull request includes two bugfixes for the latest release.