Fix more gauge bugs.