I can probably live with it as is for the time being. I’m also still working on just getting the build to match all of the customizations our ant build does.