Fix global NBT (no tricky nonsense), small cleanup