Build improvements
Fixed build order