More fixes re challenges