[BUGFIX] Fix regressions and leftovers in Context API