Updates to run on latest NQP.