More unstable fixes