Further mobile tweaks