Fix refactoring errors due to IntelliJ bug