Fix warnings on arguments and undefined
Release 2.1.2