Expand cli TLS options to other commands + misc fixes