fix issue in setup

Change-Id: Ia54fb3d6f9b5f330a0430fe3bf189ebbdfc2c020
fixed registration issues

Change-Id: Iae36e84564c3080f313eba59534d2a181c350e89