Command line override improvements