Don't use too big series index + minor changes