guard fixes