Fixing various errors due to branches mixup
Restored working dialogsSvc
x