Improve server assignment and PUG handling.