Updates to allow running with fewer dependencies.