Fixed some context issues.