Fixed some stability Issues