Fixed errors for validation