virtual scroll fixes from tests