Fix some NBT errors