Minor Service Fixes