More fixes

Summary: a bunch of nits and fixes as described in the attached tasks

Reviewed By: IanChilds

Differential Revision: D4905979

fbshipit-source-id: e1a25ee174c893add7d7eaf66a1d26169481678b