Added libraries, fixed bug on some machines.