compatiblity fixes