Fix OSX build issues introduced by changes for #33