Minor fixes on Challenge Component