[HF] Revise some ordering of operations when applying blocks