Tweaks to get the dev build complete.