bug fixes for getopt changes