#125 Minor changes.