Fix problems with root context