Bugfix on Police logic + bugfix in Gateway