Further changes to get it to build.