Fixing up some issues with mobile and other