improvements to security robustness