Fixing solution files issues for successful build