Fixing items documented in Issue #9