Fixes from meeting with Kayvon.