- fix solution and project issues