WIP google experiment fixes