guard mode fixes