minor changes to the context assembly