Deltarepo: Several bugfixes