Fix NBTTagString null data bug(PumpPlus) and cleanup patches