Fixes for PLFM-1888, PLFM-1891, PLFM-1892