NCM PAM fixes

I found some code we had internally which did not appear to have been pushed to here, despite the corresponding schema being here. I took the opportunity to also clean up whitespace and pom issues.