Fixes of security