Fixes for changed schema graphs