Refactored warnings, no warnings/failures on mac.