More component references needed fixing!