Fix regressions introduced by 0.6.6.1