Fixes from failed NMI build. #4146