Upgrade sub-components and fix some integration issues with them