Some Code review updates.