Fixed some semantic issues
Fixed some more semantic issues