Final N3609 tweaks.