Security, minor tweaks