Fixed reorder warnings.