Fixes to issue #5 and #6