Adding some more stability fixes