Freezing tweaks