experiments 2 fixes