Changes from ywwg comments.