Fix build ordering