Trying to fix error messages with patch.