Fix some minor regressions