Review/clang warning fixes

Some fixes to compiler warnings raised by clang on OSX 10.9