Issue #17. Fixed warnings (part one)