more fixes for #254