Changes to allow the Gunther scheduler to build after checkin.