Fix some issues in first Dojo Mobile mirroring patch, fixes 15682, thx Ramy Said, Ahmed Mustafa, Alia Naguib, Ahmed A Saleh (IBM, CCLA) !strict