Fix modifications to be buildable again