Attempt to fix some problems with NBT loading