Mobile fixes (small)