Updates for SSL and some badging improvements