Add overridable soft limits again

Though they are sometimes failing. Why? Not sure.