Minor fixes to TLS related resources