A few context fixes
A few fixes