Fixed the errors on the base schema