Make master compile