Fixed argument parsing issues