Fix NBT save/read