MOSYNC-2787 Removed warnings after code review