Started fixing regressions; wip