Minor changes for Apple Clang, OSX

Signed-off-by: Andrew Maclean <andrew.amaclean@gmail.com>