Stability & performance improvements