package compatibility fixes