update to work with latest runtime-schema
fix up veritas