Some modifications for compability with other projects.