Incremental rebuilds and No-Uturn on stop fixes