Further changes to get a one-click build.