PLF-5811: Fixed all the issues raised