Hot bugs fixes and Mac OSX support.