MOSYNC-3283 and MOSYNC-3301 fixed

Code reviewer: Ciprian Filipas