Merge pull request #1545 from dj2/warnings

Fixup unused parameter warnings