Security fixes!