Various stability changes