Updates to work with latest NQP.