Fixes to some minor regressions in v1.6023