Let storage create build root

Also fixes a bug whereby only the inner loop was broken when rebuilt.