Changed a number of libraries around.