more fixes for #35