Fixes for numeric command line options