more capsd-related changes