Couple of compatibility updates