Catalyst fixes