Some small stability improvement