Small updates on stability - bugfixing