Fixes for #9 #10 and #11