completeing migration to 2.4 and adding some more ignores