Second Batch of Mobile Fixes