Fixes for issues #20, #22