Few small bugfixes needed after refactoring to 9.12