Fixes for issues #11 and #12