fixing two simple bugs breaking service calls