more changes for nss, all builds now