BUILD tweaks to make sure the plugins are pulled all the way in