DEFENUM tweaks.