Security tweaks