ContextCreator fixes