COMP: get rid of warnings

Change-Id: If2f0e84ed438e2779072998e04e1edaf105d772f