9.6 compability updates