Bugfixes for coverage - Release v0.9.5