Further work on freezer fallback reliability
v2.5.2