Minor fixes and library updates.