a few more fixes for #12