COMP: minor tweaks

Change-Id: Ie60b85ae5d6764d30860e3c642eda3b5776bdeea
COMP: Add libraries where needed to fix build

Change-Id: I093c69c180fce91ce3730f68f5b14caf137bb845