fixes for PLFM-1710 and PLFM-1707