Bugfixes (v1.2.7, not to be deployed)