Bugfixes while testing in version 2.4.0-beta1