TS-2715 Fix some ESI compile warnings