Detroit reaches deals with 2 pension funds, retiree group