Some changes for Casa's patches. Lots to do.