Compilation repairs