Small tweaks to get the build to pass.