Slight tweeks to get it to build.