Some Security fixes