[Issue #61] Fix warnings.

Fixes a number of warnings for #61.