Fix the remaining Security Static Code Analysis