Back out "Small fixes"
Back out "Small fixes"

Summary: Original commit changeset: 3e1616c64a9b

Reviewed By: michalgr

Differential Revision: D18510857

fbshipit-source-id: 897fd5ccc0c34f38c0db506b4508ab87ec5dfbab

facebook/redex,facebook/redex,facebook/redex,facebook/redex,facebook/redex,facebook/redex,facebook/redex,facebook/redex,facebook/redex