Fixed NBT problems