Additional changes for mobile 3.1