more fixes for #20