Small fixes and some more recent Java UA pcaps