Fix short arguments