Updated some libs to include upstream changes