Fixing more validation errors