Fixed the last of the regressions made in my last patch.