Fix experiment bugs