Cleaned up minor issues.