Bumps Guard
Avoids spurious writes
Merge pull request #1 from mezis/fixups

Cleanups