Fixes to import certificates