Some security edits