Fixes from proofreading skim of latest kalamazoo

@SherineAwad could you please review and if it's OK, merge?