Keith's destkop QA fixes