Fix semantic issues.