some fixes to mobile