Cleanup warnings, errors.
Merge pull request #4 from cbracken/cleanup-warnings

Cleanup warnings, errors.