Support for OSX
Update autogen files