Minor fixes from PNM V52 DLL

Various minor fixes from V52