fixes bugs in Path(), For() & context