Yet more changes for mobile