Fix some minor semantic issues.