various serviceContract <--> logicalAddress fixes