Fix build sequence