final freeze fixes (hopefully)