Libraries bug fixes.