Cleaning up build warnings.
Merge pull request #284 from fnothaft/clean-warnings

Cleaning up build warnings.