fix a number of unused argument warnings
fix a number of shadow warnings
Merge pull request #1052 from mgaunard/master

Fix a number of warnings