Bug fixes with challenge registration