Update versions
Fix context resolution bug