Minor fixes to eliminate byte-compiler warnings.
Merge pull request #3 from seanmcl/master

Fix compilation warnings