More stablisation of refactoring