fixed small issues after validation merge