Fixed: SSL feature broken + CS fixes