Fix hopefully all possible deadlocks that can occur when mixed block sizes