Fix a couple compile issues.