Stability fixes and other changes