Fix validation of arguments