bug fixes PLAT-599 #1d