622b16f Mobile fixes