Fixed a few bugs in the context passing