Security considerations and other changes