Unbreaking the build