Adding security fixes for the scans