Minor CR fixes