Fix Final Build