nagi batch fixes

two minor consistency retcons