make fixes to mobile also