Fix up the wiring and update the yml files to be correct for 0.7.0