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