Minor cleanup and library updates.