Fixed schema errors with incorrect props