Moving a few things around for 3.0