Fix a bunch of bugs in the new (and old) computer manager service