fixes for PLFM-2134 and PLFM-2135