Fixes for issues #1, #2 and #4