Fixing shared context issues.