More experiment fixes.