Fixing a bunch of guard bugs