fixes on the base schema