Incremental changes

This patch will be squashed.