Start fixing up later part of NQP build a bit.