Fixed Project Issues