Fixed all validation errors