Keith's Mobile QA Fixes