fixes to meet our hardening tests