Fix Project Setup