Minor touchups for commits