Multiple fixes for the stability.