Some fixes to some regressions from recent changes