Fixes from issue #1, #2 and #3