Some fixes to get Mac/Clang build started.

Signed-off-by: Marc-Andre Laperle <malaperle@gmail.com>