Fixed a couple issuse after validation