minor bugfixes at service-handling