Address a few XXX comments, other fixes.
20 files changed