More stabilisation after refactoring