Some changes re #59