Fix Schema error builds