Rights output fixes