Mac OSX Fix and nothrow errors