more fixes after #38