Michigan lawmakers late Thursday approved the final piece of a deal to amend impending changes to the state’s minimum wage, tip credit and sick leave law.

The moves were expected to cap, at least temporarily, a seven-year battle in the Capitol and Michigan courtrooms over two petition-backed proposals.

The compromise bills preserve the state’s tipped wage credit, tweak minimum wage increases, and change how employers handle paid sick leave.