Typo + fixes for compiling on MacOS