Fix components

Change-Id: Ib9653d1f891807ea30388e4fcefb802b68bb6dfa
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>