fixes for PLAT-1011 and PLAT-1019