Still cleaning up a couple of mobile bugs