Fix -q and -h options