Fixes for freezing system