more fixes for #5