Fix some missed cases with data value blocking