More blockade fixes.
Hope it merged correctly.