Fix some XXX after meeting with Amir.