Changes: quick adaptation to make it compiled on osx