NBI compatibility bugfixes