Security fixes check-ins