WIP: make incremental sti build function properly in isolated mode