more fixes for #38