Added security fixes