One more "Any Server" fix.

Also changed some methods that returned LinkedList to List