Several small changes from Wynyard Group