Bugfixes for future 4.1.2 release