Again try to fix some mac issues...