Fixing some regressions
Enough for tonight!