Updates to work on latest NQP.