Fix command line argument passing