Fixed some component stuff