Just add some stability fixes