UPC-21 Fix compatibility matrix