Modifications after code review  for MOSYNC-2978