Innings between manual override and view controller fixes.