[2.1][Security] Fixed typo + some enhancement