Some quick and dirty component updates