Correct validation issues