yotam: Minor changes.