[PLAT-6420] Minor improvements follwoing code review.