Fixes for PLFM-1744, PLFM-1752, PLFM-1754
Merge pull request #357 from john-hill/PLFM-1744

Fixes for PLFM-1744, PLFM-1752, PLFM-1754