Adding a few protections