Clean up a couple issues.