Fix small issues with wiring up experiments properly.