Fix some issues with block splitting