Initial 3.0.0 compability changes.