minor bug fixes in ServiceManagerAdapter in production package (reviewed " OS"  tail)