Security tightening, part 1

Change-Id: I79393149e67f9365ba5a9e5ee076b0c49eba2f25