Almost stable build
Some enhancements in robustness