Fixing cert issues