Fixes for primarily mobile devices