Fixed references to a couple components