Fix fallout from NP merge back to master