Add more changes.
Fixes #1480