Added forgotten dependencies, and missing stuff.