fixes for the new systemservice parts
fixes for the new systemservice parts