Plfm 1832 comments

Address comments from PLFM-1832 - Not urgent