More fixes for side legend as well