Issue #2: Fixed newly introduced compiler errors when compiling on OS X.