Fix incremental building