Fixes for issues/warnings reported in issue #4.