More Mobile Fixes