Fix command-line parsing