Fixed a couple of bugs in getopt()