migration to GNU getopt - fixes