Fixes to get to an initial end-to-end capability.