- Fixed builders to support incremental builds