Fixes for #10