compatibility with IJ14 api, misc cleanup