Target latest submodules; requisite tweaks