minor serval plugin shutdown fixes

TBD