Fix refactoring actions