Fixes for using uppercase agis and domains across discontinuities