fixes for autochallenge