Fix some compiler warnings
Merge pull request #82 from patperry/master

Minor changes to make "gcc -Wextra" happy