Fix some regressions from the merge from master.