Made some minor changes to the referenced libraries, to be consistent.