Clean + Fix video seek