Fix issues found during NSS branch reviews

This is a ticket for fixing stuff found during NSS/TLS reviews etc.