ServiceApi fixes