Fixed errors after validation test