more unpingability fixes