Fixes and improvements
Some more stability improvement