Fixed more regressions; still wip
Fixed more regressions