More .nd2 fixes

See tickets #10526 and #10530.