Multiple fixes -- issue #141

SSLlabs scanner should be more usable now.