SSL Certificate fixes