Dev freeze fixes