Fourth hotfix for 0.15

Some more fixes and improvements.

Bugfixes