Fixed some context issues