Fixing various validation errors.