GhostService fixes