seeking fixes
merge fixes