Adding asset via amendment

We have purchased lease administration and working on testing various scenarios.  I have the new accounting rules turned on in our test environment.

One scenario was "amend the lease and add a second asset to it".  The amendment worked but there were a couple of issues.

1. The original asset was adjusted - this is due to how the allocated payments and initial direct costs change on the general information page.  This isn't extremely user friendly for this scenario and I can see users becoming frustrated.

2. After activating the amendment, leaving the page and then returning to the lease, I get "no matching buffer found for level".