Fix closure issues.