Compilation support, unicode fixes