Clean up minor issues.