Fixed semantic issues.