Some changes to support swedish characters