Some improvements for mobile