Some fixes
Add SSL