Better handling of NBT numbers