Issue #17. Fixed warnings (part three)