Minor changes from last commit on ssachan branch