fix few broken imports