more unpingfixes