context paths refactor fixes