Small ESH-INF changes