Actually all of these might not be needed. But they will be when we switch to 5.1.0