Changes after Catalyst upgrade