Fixes for experiment model