WIP: Fix some freezer functions