Fixed delport and other small bugs