NBT tweaks and corrections