Adjust some guard settings

[ci skip]