Jarv/cert fixes