[RICPLT-1853] Couple of adjustments.........