Attempt to fix project issues