Updates for services, minor fixes for issues