Fix short option parsing and ``-P`` option