Some freezing fixed