Default to analog plus fixes