Changes to compile on igep