more fixes to enguard mode stuff