Fix incremental changes