Correct several issues.