Fixed regressions
Stash commit - wip