More fiddling with service comp, trying to get new finitisation approach working.