Address build issues on mac OS-X