Bugfixes from release/0.9a11