Attempt to fix char type errors caught by W3C