Additional minor updates.