Various fixes to regressions from all of the re-architecting...