Fix catalog issues (again)