Squashing bugs in libraries section