Fix some known issues.