Minor security tweaks