Changed a couple of references to unicode() to str()