Minor security additions v2