more fixes. #378