Fixed Empty Project Issues