Various fixes for seek repair