Fixed semantic errors...