SSL Updates

Tracking from #198