Further security tweaks and TO DOs