Fix small issues on SSL