cert fixes