Allow command line overrides to always work