[FIX] Fixed some minor semantic issues.