A few tweaks.
Fixed merge conflict.