improve build order
more fixes