More weakblocks fixes