service def fixes