Fixed argument related bugs