No more ssl and small fixes