Compilation updates