A few quick fixes
Merge branch 'f-partner' of https://github.com/avalanchedotca/CACMobile into f-partner