Small tweaks in initial changes.