Changes to obey our coding conventions