Refs #6473. Fix for windows error and warnings.