Fix build warnings.  Fixes #2