updating for 64-bit warnings
fixing crash when scrolling to expanded rows