More changes

Changes I missed the first time because of cut and paste.