Fix compile errors and cpplint

Fix up on the previous round of review changes