A few stability improvments