fix some dependency ordering issues, builder preview