[TASK] Post-fixing after service unification

Same as the other one, let's hold off until more bugs are fixed in this PR. But it's looking good ;)