fixes in mobile