Master build now compiles