Fix a couple of regressions and minor polish tweaks