Fix incremental extended build