Fix a couple issues.