Fix build order