Some minor changes regarding HEncoding.