Fixes for test 2086