Services: Fix a couple of bugs in the Cast commit