Fixed some regressions from last nightly testing