Fixed some semantics