A few security tweaks