WIP: comp issues are fixed

Change-Id: I32accf00725178f8d6b6a893da1c3c60e5de564f