Fixed more librarian bugs