Fixed argument handling issues