Further kds fixes

Change-Id: I7e1fa67472c96c6cc6c4fb1a1962a69e080d6140