Larb, you are very right. I was lazy in both cases. Will correct both.