More freeze fixes