Fix API misuse Analyzer warnings
Require newer NBUKit