more fixes for #104