Address some issues.