Fix charset declarations