Fix connection locations and don't include the next connection tab in the height of the block.