Brett - Mobile fixes