Some unicode fixes

Allow strings in templates still to use proper unicode strings.