#24 minor NQ bug fixes