Fixes for blockages