Compilation modifications