Minor tweaks for security