Some more fixes to proxy and mobile device