Fix some broken merge with Amir