Minor fixes

- Make contexts work up the stack