Change from fixing unicode() to all references of unicode