PMG - Fix few issues