Make the source compatible with the newest public API