Compilation bug fixes.