Upgrade characteristic requirement, fix some bugs