Some minor security changes