Guard fixes