fix remaining -Wextra issues
Merge pull request #400 from cgzones/wextra

fix remaining -Wextra issues