Small fixes (SSL feature)