(Rice) Fix some obvious regressions