Various catalogue improvements