fixing some more component weirdness