fix path and build order