Minor improvements after fixing library server bugs.