fix unicode and package conflict issues