Fixed a merge issue from WarningFixes