Fix compatibility, as the branch shows the use of the forthcoming APIs