more fixes to try to deal with mobile devices