Correctly compiles on mac now