Fixes for UA override for the 1.1 branch