Fixed NSS 3.15 errors.

Fixes #572