Fix non-ascii characters broken by Andi ;)
Last fixes ;)