Fix refactor mess, now compiles