Fixing h20 build