Fixed OS X Compile errors introduced with commit 3e83164