Small changes to the context file handling