Small bugfixes.

Context was wrong in a few places.