Charts and gauges fixes