Small tweaks to get proper ligatures (still failing)
Compile issues on NaCl toolchains