some fixes validation