Fixes for seeking