Add missing dirs and allow compiling on OSX