Gauge: Bugfixes and polish