Added some stability improvments