Fixing a few bugs in the access restriction for first responders