More fixes for double relax.